Skip to content

engine-schema,test: fix domain reservation searchbuilder, test fixes#8725

Merged
shwstppr merged 1 commit intoapache:mainfrom
shapeblue:fix-domainreservation-dao
Mar 1, 2024
Merged

engine-schema,test: fix domain reservation searchbuilder, test fixes#8725
shwstppr merged 1 commit intoapache:mainfrom
shapeblue:fix-domainreservation-dao

Conversation

@shwstppr
Copy link
Copy Markdown
Contributor

@shwstppr shwstppr commented Feb 29, 2024 •
edited
Loading

Description

The SearchBuilder listDomainAndTypeAndNoTagSearch in ReservationDaoImpl.java is wrongly created by adding ACCOUNT_ID as part of the search param. Instead it should be DOMAIN_ID.
Additional fixes in test cases to:

  • add assert
  • add spacing

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • New feature (non-breaking change which adds functionality)
  • Bug fix (non-breaking change which fixes an issue)
  • Enhancement (improves an existing feature and functionality)
  • Cleanup (Code refactoring and cleanup, that may add test cases)
  • build/CI

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

  • Major
  • Minor

Bug Severity

  • BLOCKER
  • Critical
  • Major
  • Minor
  • Trivial

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

@shwstppr
engine-schema,test: fix domain searchbuilder, test check
e8114e5 
Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
@shwstppr
Copy link
Copy Markdown
Contributor Author

shwstppr commented Feb 29, 2024

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Feb 29, 2024

@shwstppr a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

vishesh92
vishesh92 approved these changes Feb 29, 2024
View reviewed changes
Copy link
Copy Markdown
Member

@vishesh92 vishesh92 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

clgtm

@codecov
Copy link
Copy Markdown

codecov Bot commented Feb 29, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 30.98%. Comparing base (6f27b1f) to head (e8114e5).

Additional details and impacted files 
@@             Coverage Diff              @@
##               main    #8725      +/-   ##
============================================
+ Coverage     30.97%   30.98%   +0.01%     
- Complexity    33481    33505      +24     
============================================
  Files          5355     5355              
  Lines        375830   375830              
  Branches      54895    54895              
============================================
+ Hits         116414   116467      +53     
+ Misses       243974   243936      -38     
+ Partials      15442    15427      -15
Flag Coverage Δ
simulator-marvin-tests 24.86% <100.00%> (+0.02%) ⬆️
uitests 4.36% <ø> (ø)
unit-tests 16.57% <0.00%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@shwstppr shwstppr changed the title engine-schema,test: fix domain searchbuilder, test fixes engine-schema,test: fix domain reservation searchbuilder, test fixes Feb 29, 2024
@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Feb 29, 2024

Packaging result [SF]: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 8815

sureshanaparti
sureshanaparti approved these changes Feb 29, 2024
View reviewed changes
Copy link
Copy Markdown
Contributor

@sureshanaparti sureshanaparti left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

code lgtm

@sureshanaparti
Copy link
Copy Markdown
Contributor

sureshanaparti commented Feb 29, 2024

@shwstppr can this be targeted for 4.19.1?

@shwstppr
Copy link
Copy Markdown
Contributor Author

shwstppr commented Feb 29, 2024

@sureshanaparti I guess the change was introduced in #8362 therefore it needs to be in main only

@sureshanaparti
Copy link
Copy Markdown
Contributor

sureshanaparti commented Feb 29, 2024

@sureshanaparti I guess the change was introduced in #8362 therefore it needs to be in main only

ok, thanks @shwstppr

@sureshanaparti
Copy link
Copy Markdown
Contributor

sureshanaparti commented Feb 29, 2024

@blueorangutan test

@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Feb 29, 2024

@sureshanaparti a [SL] Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

borisstoyanov
borisstoyanov approved these changes Feb 29, 2024
View reviewed changes
Copy link
Copy Markdown
Contributor

@borisstoyanov borisstoyanov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@yadvr yadvr added this to the 20.0.0 milestone Feb 29, 2024
@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Feb 29, 2024

[SF] Trillian test result (tid-9348)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 46908 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr8725-t9348-kvm-centos7.zip
Smoke tests completed. 129 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test Result Time (s) Test File

@shwstppr
Copy link
Copy Markdown
Contributor Author

shwstppr commented Mar 1, 2024

Merging based on approvals and test results

@shwstppr shwstppr merged commit 68a3e9e into apache:main Mar 1, 2024
@shwstppr shwstppr deleted the fix-domainreservation-dao branch March 1, 2024 11:53
dhslove pushed a commit to ablecloud-team/ablestack-cloud that referenced this pull request Mar 5, 2024
@shwstppr @dhslove
engine-schema,test: fix domain searchbuilder, test check (apache#8725)
0c27207 
The SearchBuilder listDomainAndTypeAndNoTagSearch in ReservationDaoImpl.java is wrongly created by adding ACCOUNT_ID as part of the search param. Instead it should be DOMAIN_ID.
Additional fixes in test cases to:
- add assert
- add spacing
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@yadvr yadvr yadvr approved these changes

@vishesh92 vishesh92 vishesh92 approved these changes

@sureshanaparti sureshanaparti sureshanaparti approved these changes

@borisstoyanov borisstoyanov borisstoyanov approved these changes

@harikrishna-patnala harikrishna-patnala Awaiting requested review from harikrishna-patnala

Assignees

No one assigned

Labels

component:orchestration

Projects

None yet

Milestone

4.20.0

Development

Successfully merging this pull request may close these issues.

6 participants

@shwstppr @blueorangutan @sureshanaparti @yadvr @vishesh92 @borisstoyanov